Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 05:51:42 +0000 (05:51 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 6 May 2010 05:51:42 +0000 (05:51 +0000)
commitb8377fd39d530359bbd2ab11ec2fda24d9a4d4a4
treef770965fb001963719f1ecbdacad9ce88b360f06
parente19427ddf2fd70aab2e0fb520c743863785528a3
parentc6b112ed59e8f4e531a2aa82d99f893ca2338215
Merge from mainline.